From b05b21f8a0bfaf0a0fe220e9a75901a4063c478f Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Sun, 19 Jun 2022 16:24:38 +0200 Subject: [PATCH] Fix FTBFS against NETCDF>4.9.0. (Closes: #1012703) --- debian/control | 2 +- debian/patches/110_vtk9_netcdf.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 debian/patches/110_vtk9_netcdf.patch diff --git a/debian/control b/debian/control index 0141e055d..5d7b4d367 100644 --- a/debian/control +++ b/debian/control @@ -42,7 +42,7 @@ Build-Depends: chrpath, liblz4-dev, libmrmpi-dev, libnetcdf-cxx-legacy-dev, - libnetcdf-dev, + libnetcdf-dev (>= 1:4.9.0), libogg-dev, libosmesa6-dev, libpng-dev, diff --git a/debian/patches/110_vtk9_netcdf.patch b/debian/patches/110_vtk9_netcdf.patch new file mode 100644 index 000000000..888225e2b --- /dev/null +++ b/debian/patches/110_vtk9_netcdf.patch @@ -0,0 +1,16 @@ +Description: Fix FTBFS with new netcdf +Author: Anton Gladky +Bug-Debian: https://bugs.debian.org/1012703 +Last-Update: 2022-06-19 + +--- vtk9-9.1.0+really9.1.0+dfsg2.orig/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c ++++ vtk9-9.1.0+really9.1.0+dfsg2/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c +@@ -1770,7 +1770,7 @@ void ex__compress_variable(int exoid, in + */ + + /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ +- const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ ++ // const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ + /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */ + const int SZIP_PIXELS_PER_BLOCK = + file->compression_level == 0 ? 32 : file->compression_level; diff --git a/debian/patches/series b/debian/patches/series index 11535dec5..ee1cfee67 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ 97_reproducible_builds.patch 98_fix_mpi4py.py 99_fix_ftbfs.patch +110_vtk9_netcdf.patch -- 2.30.2